Fixing bug the was added in last update