Correcting issue #1719 and issue #1720