fixes and closes #11