Working on issue #1386 and issue #1424