SKOL-1 #comment Partially fixed this ticket, shouldn't break anymore.