#1899 and #1883