Fixes the first FATAL in ATLASSIM-5297 Second FATAL requires further investigation (not reproducible yet)