fixed smth around location based data...