#1 messages fixed