Rithista

@thaddeusdiamond Followup on this PR, tested this PR in a test/production app and works as indended. Would strongly recommend this gets merged, otherwise other next users will fall into the...