Closes issue #1672 & #1664