#83 Fix broken activity completion functionality