Noting #1097