Fix kicking ass bug