Issue #128 - fix errors