Fixed output for functions called by ESI