*8904* Old plugin behavior semi-fixed