#83 Fixed Location inputs