This fixes ModernBB/Luna#922
Merge pull request #925 from xf17/iss#922

This fixes ModernBB/Luna#922