fix/change 12