[019] Fixed errors