Closes issue #1344 & #1346