#806 fixed