Hack to catchup with highlight v0.8