Bug fix for some messages