ya16 fix