add scala patching back in O.o