2.2.x fix for issue #140