Replacing the right thing!  (Thanks Craig)