next step to solve issue #10