Really fix UNSAFE error.