of-917 fix

of-917 fix 2019-11-15T09:07:22+00:00