Fixed bug with Nested Set trait not being included