modified the fix H-8849 accordingly to the review comments from Robert J. E.