fix possible crushes