Fixed bugs from feedBack.