fixed issue GH-134