Fixed non energy conserving bug on collisions.