resolves #17 locations fixed