Switch to non-standalone checks