fix for part 2 of #141 as noted by @pattentrick