Fixed Henry's mess