working on issue #52