Forgot to un comment a nasty piece of code