Nicer fix