Initial stab at solving activity generation issue.