Fixed to match BergModCore fixes