Solve issue #21