Added message build fix