Follow up of cd5c61b

* Prefix stripping inproved. (Thanks Xcelled194)