initial patch for #794