This fixes the highlight. Thus fix #14