Fix small problem that occurred when merging from upstream
Fix small problem that occurred when merging from upstream

dullgiulio/redoctober,ejcx/redoctober,ejcx/redoctober,Bren2010/redoctober,dullgiulio/redoctober,Bren2010/redoctober