Closes #1240 

 Closes #1240