Trying to fix the crashing.