De-fix a crashing bug