Conditional fields no longer break everything FINALLY(again)