tackle issue #43