Patched for Hapi 4.x