hopefully closes #38