Additional fix for MR-345.