Fixed for no plugins