Attempt to fix crash on remote domain