Solved issue 7818