Make manual fiber assignment support work