Updated to #1161.