#464 and #475