Sneaking in a fix for #1437