Make frag-id more bulletproof