fix j6 support