Correctly .then nonfunction values (802/872)