making more robust for non-mjolnir usage