Resource Tracker Issue 89