fixed hidden overflow
merge with dev