fix message fmt
porting continued