fix currentActivity update