Fixed for ASG creation