Backport fix for #222 to version 2.5