Working on issue #1077
Closes #1077