try to solve issue #24