Solve issue #62