Fixed bugs III