fix nil part