Fixed issue with EMfeatures