working on fixing on backtracker