Port fix for #1476