Closes issue Issue #1563