Fix better

svornostrequested to merge
svornost/fc-pregmod:pregmod-master into pregmod-master

Fixes #4837 (closed) more.

Merge request reports