Guanako: Fixed variable completion