Fixed #2250

Fixed #2250 with #2271 
Also much slower.