Add a workaround for destructor sadness