Remove escape check