tweaked fix for #1446