Backport #18 fix to 2.3 branch