WIP fixed issue with height