Commit for the crash bug