Corrects the mapping issue of #6111

Reduced the access requirement from CE to engine access.
Someone else will probably have to look at the freezer issue.