Kevin fixed to bugs