Hotfix/issue #44 hydrator interface compliance

Fix for #44