Fixing getByRecipient problem