Bug fixes 3772. 3773