after discussion in the chat you're on top of this in a soon to be other pull request :)