Bug with activity state loss