Fix moving only to locations