more hasReceived fixes