Fix #1803

#1803