Add EMR fix to latest changes