Fixing bug #3