Possible but doubtful fix for #2914