This closes fixes #167