Work #475 and #458