Fixing a crash caused by the last fix