Backport fix #927