additional changes to fix issue #1458