enhancement for the v1.2.0