Fixed freeze on spot check