fixed an other plugin issue
moved the fallback further up to assign plugins
Merge branch 'fix-plugins2' into develop