Attempt to fix a crash.
Reverting back chancges.