fix problems (2)