Fixes/issue 167