try to fix msg22 core some more