fixing routing issues