Second part of the fix for #931