Solve issue #63