bug #3 Squashed