Solve issue #22