june16 fix