Closes issue #1653 & #1655