fixes and closes #104