CORE: real fix for cc2197fea6b2b213c4c5fac3f5e6043ed32c1c22