Fix for resource tags