Fixed pipeline handler order