RE-FIX location form bug