Added fix for es feature