solve issue #21