Updated to #1166.