Working on issue #1532