Issue 347 - Hapi days are here again.. (17)