Fixed issue with expanding