I1216

Fixes issue #1216