Closes #1481 & #1417