work on issue #284