fixed some eilat checking