trying to fix some issues