Fix automatic payload selection