Fix #44 for 2.2.x branch