Try to fix routing