Fixed EEM hooks