Continuation fix for location form bug