Fixed for ARC