and fix the "locationsthat" part