fixed GH-127 issue