Fixed hidden conflict