Fixing bug #7