Fix issue with activity showing old data