More fixes. When did this stop working.?