Fixed #116 in 2.2.x