Oops commented out wrong line for previous buggy fix