Fixed esm class