fixed examples and tests have been broken by PR#0183