Closes #1579 & #1599