Fix retrieval of resources