Should be >= 2 (not > 2) here and on line 889 as well, right?