Bug-fix from HEAD.