Fixbug

Fixing bug. please review.