Noting #1370, #620