Add changes for #1249

Closes #1249
1 file changed