(Issue 1034)