Fix crest issue #162
Add support for ENT