Fix activity issue