Fixing another linkhandler bug