fix problems...