Core: Fix logic fail in 77743ea13e991a10b11e6707d7def84336ebcfe7