Better fix?