Plugin order fixed