Fixed location bugw