Updated to #1186.