Re-added check on relayed flag