Fix SOAP-549 duplicate resource field