Problem is solved. I still need to port my modification, but I've done a temporary fix.