Fixed conflict with other plugins