Tracker Issue 65