Fixing bug 230