Solve issue #28