Propagated correctly the locations