Closes #1523 & #1524