not convinced... closes #34