addresses #1006