Probable fix for #1406