fix v1.2