Issue #494 - Fix Implimentation
Issue #494 - fix implementation