Fix execution when no longer running