Fixed bug with nested resources
7 files changed