applied patch for issue #1573