Fixing bug #1