Fix for #1330

Fix for #1330