first 3.5 fix