Second attempt for Fix/master/issue 3659