Minor improvement on fix