fixed issue GH-126