Attempt to fix 37-based build