Fixed for good and tested