Probably fixed message bug