Address issue #1015