Fixed location issue with last change