Fixed empty message situation. hack