Thank you, I'll look into this. Do you mind opening a separate PR?