Solve issue #10