Fixed issue with related resources