#775 and #788