JRCU's Patch (3/11)