[#1522]Fixed errors