Fix Activity performance issue