One part of the fix for #491.