fixes for problems (2)