Closes Issue #1217

Closes Issue #1217