Fixed more bug.