to address issue #22