Fixing bug 1