Working on issue #1414 and closes #1503