Resource Tracker Issue 91