Fixed HHH-7407