v1.2 quick fix