Fix with receive message structures