Hmhm, fixing bugs