working on issue #40