Fix broken fastpath support