Closes #1291, Closes #1290