Fix the 'wh' a bit