Fix consistency between ep05 and ep08.