Fixing bug 243