Fixed location path issue