(Fix) Fixes location selection

Closes #49