escape bug fixed