First try to eliminate #36