Fixed wrong highlighting