Fixed hidden bug