Plugin functionality issue fixed