Fixes ExecutionError errors