Fix a return type instability