fix 12 issue