BugFix with not empty baseUri