fix Crash