JRCU's Patch (6/11)