part 1 of fix for misaligned activities