Improved fix to #660
Improved fix to #660

pwz3n0/schemaorg,schemaorg/schemaorg,schemaorg/schemaorg,ya7lelkom/schemaorg,unor/schemaorg,vholland/schemaorg,gkellogg/schemaorg,vholland/schemaorg,quantegy/schemaorg,URXtech/schemaorg,twamarc/schemaorg,tfrancart/schemaorg,gkellogg/schemaorg,mortizbank/schemaorg,twamarc/schemaorg,ya7lelkom/schemaorg,tfrancart/schemaorg,ynh/schemaorg,gkellogg/schemaorg,lanthaler/schemaorg,sdo-sport/schemaorg,schemaorg/schemaorg,cesarmarinhorj/schemaorg,quantegy/schemaorg,dbs/schemaorg,pwz3n0/schemaorg,dbs/schemaorg,unor/schemaorg,vholland/schemaorg,vholland/schemaorg,unor/schemaorg,lanthaler/schemaorg,ynh/schemaorg,tfrancart/schemaorg,ya7lelkom/schemaorg,gkellogg/schemaorg,pwz3n0/schemaorg,lanthaler/schemaorg,cesarmarinhorj/schemaorg,hschema/schemaorg,sdo-sport/schemaorg,sdo-sport/schemaorg,ynh/schemaorg,hschema/schemaorg,dbs/schemaorg,twamarc/schemaorg,hschema/schemaorg,mortizbank/schemaorg,schemaorg/schemaorg,schemaorg/schemaorg,cesarmarinhorj/schemaorg,dbs/schemaorg,mortizbank/schemaorg,URXtech/schemaorg,tfrancart/schemaorg,quantegy/schemaorg