JRCU's Patch (2/11)