Fix height issue
With Daniel