Fixing bug for elb