Fixed some BUG.