Last height fix for the moment