Solve issue #57