Fixing all turned off bug