fixed crash management