fixed performance issue with engine check