Possible ZEN-10187 fix