Note fix of #135, cherry-picked from master.