Fixed issue with inherited resources duplicating fields