Fixed location problem (Still not fully implemented)