Fixing BR #335 - needs a core restart