Fix #1418

#1418