More robust enter check