fixed issues with messages