Solve issue #6