fixed height related issues, tested, seems like its stable