Quick fix for messages