Fixed a little bit more on nested