Closes issue #1462 & #1434