Fixed return and removed ESC check