I moved this exception to a new PR yes, will have to wait until that is approved so I can rebase this on that one later