fix/change 8