fix again rookie bugs