Attempt to fix crashing…