Should Resolved issue #1353
Working on issue #1669