Fixing critical bug