solve issue #53