10.5/10.6 fix