Fixed For Old Plugins