Untested fix to #1570