Hubert's first fix