Improve entry condition.