Fix for Eddy-Wrapper does not work properly #769