applying patch to activity module to deal with some busted-ness