Closes #1314 & #1316