Works with newer hapi