Relates to #1861