Fixed "Message too long" error