New patch for issue 195