ej-base fix