Proposal for issues #1937 #1938 and #1946
Additional corrections for #1946