Avoid pwd problems