Fix version 2 for Eddy-Wrapper does not work properly #769