Fixed changes from react-router