Fixed r28259 which broke hh and h modifier.