Fix folder/last regression