Address issue #1028