Fix for #1330

ref #1330