[Fix #434] Expand default-directory before using it