Plugin handler fix