Fixed Location/Loading issue