Issue#309：fix

Issue#309：fix