Oops - re-add fix lost by d766874