Will check this tomorrow. If you come to it in the meantime, feel free to open a PR :) Thx