fixing the -all mode