Solve issue #15