Fixes closes #168