Resolve conflict with other plugin