Issue#302:fix

Issue#302:fix