Fix for duplicate UID bug
Plugin handler bugfix, thanks K4r3l01 :)