refine 1.6 support