Fix issue when there is no subfolder