#1729 and #1994