revert

calis de revert
fix 1.2
Merge branch 'fix-1.2'