fixing all around