Issue #117 - fixing in progress