work on issue #243