Fixing messages finding