#807 fixed