fixes fro 5 and 7