Fixing the hook execution.

Still some duplication remains but close.
Version bump.