Implemented #1269.