Fixing bug #6