Fixed bugs III.