Solve issue #20