Attempt to fix 'bad URI' bug.