improve previous commit: also fix locations