Fix/master/issue 2721