Trial fix for #1054.