Initial fix for #1446