Fixing nested listing