First version of patch for issue #2171485