FWK-12 : Fix routing