Yet another small fix, sorry for making this many Merge Requests instead of grouping everything into one.
Before:
After: