fixed GH-10 issue