ya, I had this issue in my code on the weekend.  I did the replace - I'll push the update and add a test tonight.