work on Issue #22