Yes, you are correct. I wanted to create another sub-task for this, but it will also be part of this pull request. I didn't have enough time to get to this yesterday.