Fixes Engineer Memory loss

Fixes #694