solve issue #8

solves issue #8