Fix for latest merge