Fix plugins issue