Ideally fixes leave failure