I did actually take a look at this, but since I'm in HC and am dragging my feet (since work is currently taking priority over finishing my ascension), I haven't tested my patch. The code I stuck in is a little dirty, and could probably be made more elegant, but I figured maybe simply preventing...