Closes #1233 & #1236