I fixed the switch when the current clothing is Gobstones.xml
I added 2 TODO to the future. Is no critical