bug and height fix