Quick fix on messages