fixed_issue1 #2