Fix #1468

#1468