2nd try fix