bugfix, cached height was not always computed
bugfix
Merge remote-tracking branch 'origin/master'