AID-48 Try to fix problems with URI