Noting #1245, #1252