Fixed support for 1.2.0