Issue #128 - fix validation