Backported #34 fix to 2.2.4