Solve issue #2