maybe fixing doubledeath issues