Solve issue #19