Solve issue #26