Added use of nonzeroMin removed switch