Fixed multiple locations - closes #75