fix for messages