Fixed for "A" and "AAAA" cases