Hacky fix for duck tape output URI issues