Simple 0-check added