Try to solve issue 10166