fix collision on/off issues