Fixed conflict with other plugin