Removed incorrect optional item check