Backport fix #11