Avoid problems with fish shell