Closes #1247 & #1096