Fixing previous commit, it had some debug code in it