Attempting to fix start-up crash for some users