Attempt to fix problematic signatures