Temporarily Fixed Crashing Bug