Attempt to fix the linkhandler