Fix activity message problem (related to #120)