address issue #17