Fixing message2 change