(Issue 1164)