Fixing bug 1208