Fix as per our-boxen issue 79