Fixed for EE 2.8