fixed possible Crash