Solve issue #58