Solve issue #67