Fixed EE3 compatibility bug