Closes Issue #1554