Untested fix for the tinyurl problem