Fixing for v1.2 release.