revised fixes