Fix fuckup 2

James R.requested to merge
bruh2 into master

I did !664 (merged) and !665 (merged) separately and forgot they conflicted.

Merge request reports