Removed the crashing