Are mail signatures fixed?

[Pagemakers]

In Yosemite if your email signature contains an image and you have multiple email accounts, switching between accounts causes the signatures duplicate in the email instead of swapping from one to another.

Is this fixed in L Kapitan? (thank you Siri for getting your own OS name wrong)!!!!