patch for issue 163