Added code to address issue #1403

Should fix issue #1403