fix routing issues