Solve issue #17