Solve issue #43