implemented Mike's suggestion on #486