fix the simple problems..