minor changes after PR#42