bug #1621 last fixes