Hack for improved client destroyed support