fix some issues with it