Potential bugfix

brickoderequested to merge
(removed):fixes into pregmod-master

Might fix #3753 (closed), but unable to test atm.

Merge request reports