Fixes and closes #138