Bug fix for base urls