fix problems ..