fixes for artf788527,artf824190