work on issue #100 and similar related issues