Escaping Added, Bug Fixed