Fixed esmtool