Fixing bug 242