[FIX] FE routing problems