I’m putting this into the pipeline and I’ll make a better patch after it’s reviewed since I’m not sure I got everything right. https://bugs.freepascal.org/view.php?id=35772 Regards, Ryan Joseph