Working on issue #1395