Better fix