Issue #509 - fix implementation issues