I have a branch that can fix this as soon as this refactor is merged.