fixed stemming from Brian Dorsey's code review