need bugfix from @wardcunningham