fixed empty messages