yoav fixes