fixed issue GH-131