Aye true. This could apply to a lot of other modules outside of this PR. Happy to do it after though.