Maybe he has to merge next into this again? Because thats one of the two defines i fixed in a recent PR.