Fix speaker spaces issue