Attempt to fix the phantom hold bug in a saner way
I don't have a compiler here, so I can't really test it. It *should*
compile, but those who know me know that means nothing.