not crashing
fix merge