Issue#338 from term to term

resolves #338
resolves #307