Joan made a second wish. Fixing that problem was easy. "I wish that I could change my shape in more ways than I did before, including all of my body."
Joan concentrated again and tried to change into a guy. This time it worked. Soon she was just Jon again, or someone that looked like Jon... still wearing a skirt and dress.
She changed back into Joan. "This is going to be harder than I thought," she mused. It looked like she was stuck as Joan until she could figure out something about the clothes wish.