Trying to fix activity deletion