Closes issue #1270 

 Closes issue #1270