Fix/test386

Update of #678