[013] Fixed bugs