fixed crash?