Fixed standart bugs