This looks good at first glance, I will merge after testing it locally.
Works fine, thanks for the PR.
Commit 1acdbccc fixes this pull-request
Pull-Request has been merged by mymindstorm