Additional fix for MR-392.