fixing issues...