Bug fix from rel-1-2