Reduce URI creation in fix #115