Fix to prevent merge failure