Readded fix. (Still not fully working)