moar bug fixing on the GW command

Correcting the index on .match for the new GW command