Testing changes to fix issue that 2.03 failed to fix