Location types bugfix