fixed crush bug