Fix: regression of context0.hn and context1.hn optimization