Bug fix and no source plugin control