fixed rueslt issues