fixes #1, resolve problem 'OR in values 0 or Null'