Attempting to fix crashing