#1882 reverted changes of r8688 and r8692 because I think I found now the real cause for all these problems