[008] Fixed bugs