Fixes #90.  Also alternative service hook for 4.4.2