Fix trouble confict with plugins