Fixed else if issues.