hopefully fix some issues...