made a more robust solution for the escaping problem, and fixed the duplicate source bug