trying to solve some issues...