Fixed lack of URI expansion in case of singleton pattern