Fixed "message not defined" error