Fix error with new and old style.
Merge branch '1.2.0'