Additional related fix to issue 1020