Fix for external activities