work on issue #289