Fixed - avoiding false field value