* backport fix from trunk