Fixing bug 320