And Remove wrong spawns Thanks to @Kittnz (cherry picked from commit d3ebb79d78b9d914c1c782e3824060d4fdb91893)
hotfixes