Fix to EJ's Crash Bug