Get rid of this function. I found it a bit annoying .. and we don't do it anywhere else. Thanks :-)