fixing all