might have the location issue fixed