fix location to prevent deadlock