Fixed PR1629.