fix some issues with last fix