fixes and closes #244