bug #1475
some more fixes