Possible clean fix for last 3 messages