Closes issue 735