Fixes and closes #38