Bug fix Invalid Uri parsing