Solve issue #59