Closes issue #1682 & #1683