addressed issue 822