Fix for hapi