fixed crash for real this time