realated to issue #41