Fixed issue with list wrapping