Fixed conflicts with bundle plugin.