FEC-2458 #time 1h #comment better height calculations