Solve issue #64