Patch shitty way of managing locations