Fix from HEAD.