Fixed undefined BaseUri bug