Initial fix for issue on nested route links