Updated to #1159.