Proposed fix STAR900067286