Fixes on #433
Fixes on #433

bishop335/shields,rayners/shields,RIAEvangelist/shields,adjohnson916/shields,PeeHaa/shields,workhorsy/shields,tomap/shields,RIAEvangelist/shields,Daniel15/shields,clintonhalpin/shields,HossainKhademian/Shields,mahirk/shields,rmuhamedgaliev/shields,MGDIS/shields,roomthily/shields,clintonhalpin/shields,gcochard/shields,wanji/shields,pine613/shields,mahirk/shields,spalger/shields,malditogeek/shields,mkiisoft/shields,krak3n/shields,Borgaard/shields,dnvriend/shields,rayners/shields,zackp30/shields,wanji/shields,pine613/shields,adjohnson916/shields,Miovision/shields,dnvriend/shields,allenmanning/shields,igormukhingmailcom/shields,igormukhingmailcom/shields,spalger/shields,PeeHaa/shields,sanemat/shields,malditogeek/shields,piperchester/shields,mateusrevoredo/shields,badges/shields,mkiisoft/shields,bishop335/shields,Borgaard/shields,zackp30/shields,freezy-sk/shields,marktopper/shields,Miovision/shields,krak3n/shields,freezy-sk/shields,Daniel15/shields,sebyddd/shields,Miovision/shields,piperchester/shields,IveWong/shields,jennifer421/shields,HossainKhademian/Shields,workhorsy/shields,andyshinn/shields,badges/shields,mateusrevoredo/shields,tomap/shields,roomthily/shields,sebyddd/shields,jennifer421/shields,MatzFan/shields,andyshinn/shields,MatzFan/shields,sanemat/shields,IveWong/shields,badges/shields,rexxars/shields,allenmanning/shields,marktopper/shields,rexxars/shields,gcochard/shields,rmuhamedgaliev/shields,MGDIS/shields