Another direct fix for #2170 (got the error again)
Another direct fix for #2170 (got the error again)

ealonas/Markus,MarkUsProject/Markus,ealonas/Markus,MarkUsProject/Markus,WilsonChiang/Markus,MarkUsProject/Markus,finnergizer/Markus,melneubert/Markus,david-yz-liu/Markus,arkon/Markus,ealonas/Markus,WilsonChiang/Markus,finnergizer/Markus,benjaminvialle/Markus,melneubert/Markus,reidka/Markus,david-yz-liu/Markus,arkon/Markus,jeremygoh/Markus,reidka/Markus,ealonas/Markus,wkwan/Markus,ealonas/Markus,david-yz-liu/Markus,binuri/Markus,binuri/Markus,reidka/Markus,wkwan/Markus,MarkUsProject/Markus,arkon/Markus,binuri/Markus,finnergizer/Markus,wkwan/Markus,finnergizer/Markus,jeremygoh/Markus,wkwan/Markus,wkwan/Markus,david-yz-liu/Markus,finnergizer/Markus,jeremygoh/Markus,benjaminvialle/Markus,finnergizer/Markus,binuri/Markus,finnergizer/Markus,WilsonChiang/Markus,reidka/Markus,wkwan/Markus,binuri/Markus,MarkUsProject/Markus,melneubert/Markus,ealonas/Markus,binuri/Markus,reidka/Markus,MarkUsProject/Markus,david-yz-liu/Markus,arkon/Markus,WilsonChiang/Markus,WilsonChiang/Markus,melneubert/Markus,arkon/Markus,jeremygoh/Markus,wkwan/Markus,WilsonChiang/Markus,MarkUsProject/Markus,melneubert/Markus,jeremygoh/Markus,benjaminvialle/Markus,benjaminvialle/Markus,melneubert/Markus,ealonas/Markus,WilsonChiang/Markus,wkwan/Markus,david-yz-liu/Markus,arkon/Markus,melneubert/Markus,finnergizer/Markus,ealonas/Markus,jeremygoh/Markus,reidka/Markus,benjaminvialle/Markus,david-yz-liu/Markus,melneubert/Markus,jeremygoh/Markus,binuri/Markus,arkon/Markus,ealonas/Markus,benjaminvialle/Markus,benjaminvialle/Markus,WilsonChiang/Markus,reidka/Markus,arkon/Markus,reidka/Markus,jeremygoh/Markus,david-yz-liu/Markus,david-yz-liu/Markus,binuri/Markus,finnergizer/Markus,arkon/Markus,jeremygoh/Markus,wkwan/Markus,reidka/Markus,WilsonChiang/Markus,melneubert/Markus,MarkUsProject/Markus,binuri/Markus