SPC-801 & SPC-804 remove fix
SPC-801 & SPC-804 collapse fix