[3.x] Fixed #246

FIxing for 3.1.1 release.