Solve issue #84