Core replacement fixes

Some fixes for a future feature, that i apparently didn't finish and released anyway

What's Changed

• fixed core replacement logic by @mattpannella in #233

Full Changelog: 3.2.0...3.2.1