Fix #2236

#2270