Adapt to pionner fix
Merge branch 'sync' of https://github.com/ParagonDevelopmentTeam/pioneer into sync