Isaak Dieleman - 2022-03-17

Seems this issue has been around forever, need to code a solution.